Ignore G_IO_ERROR_FAILED_HANDLED errors (#532262).

2008-05-25  Jan Arne Petersen  <jpetersen@jpetersen.org>

	* gtk/gtkfilechooserdefault.c:
	(shortcuts_activate_volume_mount_cb): Ignore G_IO_ERROR_FAILED_HANDLED
	errors (#532262).

svn path=/trunk/; revision=20145

diff --git a/ChangeLog b/ChangeLog
index d496206f156e71f28d628f4cdb874135c89c0f56..cfa0b4f4b821de0c0aedfe1446e96619b88e2c63 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-05-25  Jan Arne Petersen  <jpetersen@jpetersen.org>
+
+       * gtk/gtkfilechooserdefault.c:
+       (shortcuts_activate_volume_mount_cb): Ignore G_IO_ERROR_FAILED_HANDLED
+       errors (#532262).
+
 2008-05-25  Björn Lindqvist  <bjourne@gmail.com>
 
        * tests/pixbuf-lowmem.c

diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index ecb01d53ef006cf24ca8944db068d2d3269dde27..308cac669d8c2a886f333874e2de169629269372 100644 (file)
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -10346,12 +10346,15 @@ shortcuts_activate_volume_mount_cb (GtkFileSystemHandle *handle,
 
   if (error)
     {
-      char *msg;
+      if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_FAILED_HANDLED))
+        {
+          char *msg;
 
-      msg = g_strdup_printf (_("Could not mount %s"),
-                            gtk_file_system_volume_get_display_name (impl->file_system, volume));
-      error_message (impl, msg, error->message);
-      g_free (msg);
+          msg = g_strdup_printf (_("Could not mount %s"),
+                                 gtk_file_system_volume_get_display_name (impl->file_system, volume));
+          error_message (impl, msg, error->message);
+          g_free (msg);
+        }
 
       goto out;
     }